525b4afa6ad010ac65813fe97500e49edf53f0c5,src/main/java/com/couchbase/client/dcp/conductor/Conductor.java,Conductor,stop,#,91

Before Change



       return Observable
            .from(channels)
            .flatMap(new Func1<DcpChannel, Observable<?>>() {
                @Override
                public Observable<?> call(DcpChannel dcpChannel) {
                    return dcpChannel.disconnect().toObservable();
                }
            })
            .flatMap(new Func1<Object, Observable<?>>() {
                @Override
                public Observable<?> call(Object o) {
                    if (ownsConfigProvider) {
                        return configProvider.stop().toObservable();
                    } else {
                        return Observable.just(1);
                    }
                }
            })
           .doOnCompleted(new Action0() {
               @Override
               public void call() {
                   LOGGER.info("Shutdown complete.");
               }
           })
            .toCompletable();
    }

    /**

After Change



       Completable channelShutdown = Observable
            .from(channels)
            .flatMap(new Func1<DcpChannel, Observable<?>>() {
                @Override
                public Observable<?> call(DcpChannel dcpChannel) {
                    return dcpChannel.disconnect().toObservable();
                }
            })
            .toCompletable();

        if (ownsConfigProvider) {
            channelShutdown = channelShutdown.andThen(configProvider.stop());
        }

       return channelShutdown.doOnCompleted(new Action0() {
           @Override
           public void call() {
               LOGGER.info("Shutdown complete.");
           }
       });
    }

    /**